03403bf5f2508c1032dfcaa7a485d00c7716fe10,opennms-model/src/main/java/org/opennms/netmgt/model/OnmsSnmpInterface.java,OnmsSnmpInterface,mergeSnmpInterfaceAttributes,#OnmsSnmpInterface#,424

Before Change


            setLastCapsdPoll(scannedSnmpIface.getLastCapsdPoll());
        }
        
        if(scannedSnmpIface.isCollectionUserSpecified()){
            setCollectionEnabled(scannedSnmpIface.isCollectionEnabled(), true);
        }else if(!isCollectionUserSpecified()){
            setCollectionEnabled(scannedSnmpIface.isCollectionEnabled() || isCollectionEnabled());
        }
        
    }

After Change


            setLastCapsdPoll(scannedSnmpIface.getLastCapsdPoll());
        }
        
        if(scannedSnmpIface.isCollectionUserSpecified() || !isCollectionUserSpecified()){
            setCollectionEnabled(scannedSnmpIface.isCollectionEnabled(), scannedSnmpIface.isCollectionUserSpecified());
        }
        
    }